diff --git a/libsolidity/Parser.cpp b/libsolidity/Parser.cpp
index 1ea413ee9..44f0a54ad 100644
--- a/libsolidity/Parser.cpp
+++ b/libsolidity/Parser.cpp
@@ -266,9 +266,11 @@ ASTPointer<Statement> Parser::parseStatement()
 		// starting from here, all statements must be terminated by a semicolon
 	case Token::CONTINUE:
 		statement = ASTNodeFactory(*this).createNode<Continue>();
+		m_scanner->next();
 		break;
 	case Token::BREAK:
 		statement = ASTNodeFactory(*this).createNode<Break>();
+		m_scanner->next();
 		break;
 	case Token::RETURN:
 	{
diff --git a/test/solidityParser.cpp b/test/solidityParser.cpp
index 025cd74d1..701a6e76c 100644
--- a/test/solidityParser.cpp
+++ b/test/solidityParser.cpp
@@ -185,7 +185,7 @@ BOOST_AUTO_TEST_CASE(while_loop)
 {
 	char const* text = "contract test {\n"
 					   "  function fun(uint256 a) {\n"
-					   "    uint256 x = (1 + 4).member(++67) || true;\n"
+					   "    while (true) { uint256 x = 1; break; continue; } x = 9;\n"
 					   "  }\n"
 					   "}\n";
 	BOOST_CHECK_NO_THROW(parseText(text));