2 files changed, 2 insertions, 4 deletions
diff --git a/Token.h b/Token.h
index 8caaccdb..43a5b90b 100644
--- a/Token.h
+++ b/Token.h
@@ -304,8 +304,6 @@ namespace solidity
 	\
 	/* Identifiers (not keywords or future reserved words). */         \
 	T(Identifier, NULL, 0)                                             \
-	/*  Bytes0 token is used for empty string. */                      \
-	T(Bytes0, NULL, 0)                                                 \
 	\
 	/* Keywords reserved for future. use. */                           \
 	K(As, "as", 0)                                                     \
diff --git a/Types.cpp b/Types.cpp
index 1316bbc3..2f08915e 100644
--- a/Types.cpp
+++ b/Types.cpp
@@ -121,7 +121,7 @@ TypePointer Type::fromElementaryTypeName(Token::Value _typeToken)
 	{
 		int offset = _typeToken - Token::Int;
 		int bytes = offset % 33;
-		if (bytes == 0 && _typeToken != Token::Bytes0)
+		if (bytes == 0 && _typeToken != Token::Bytes1)
 			bytes = 32;
 		int modifier = offset / 33;
 		switch(modifier)
@@ -131,7 +131,7 @@ TypePointer Type::fromElementaryTypeName(Token::Value _typeToken)
 		case 1:
 			return make_shared<IntegerType>(bytes * 8, IntegerType::Modifier::Unsigned);
 		case 2:
-			return make_shared<FixedBytesType>(bytes);
+			return make_shared<FixedBytesType>(bytes + 1);
 		default:
 			solAssert(false, "Unexpected modifier value. Should never happen");
 			return TypePointer();