diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantResolver.java
index 0005fec798c..e1bb1c33992 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantResolver.java
@@ -132,7 +132,7 @@ public class CompileTimeConstantResolver {
         }
         else if (JetTypeChecker.INSTANCE.isSubtypeOf(builtIns.getFloatType(), expectedType)) {
             try {
-                return new DoubleValue(Float.parseFloat(text));
+                return new FloatValue(Float.parseFloat(text));
             }
             catch (NumberFormatException e) {
                 return OUT_OF_RANGE;
diff --git a/compiler/testData/diagnostics/tests/Constants.kt b/compiler/testData/diagnostics/tests/Constants.kt
index b0993ea0d0f..2a2960a644f 100644
--- a/compiler/testData/diagnostics/tests/Constants.kt
+++ b/compiler/testData/diagnostics/tests/Constants.kt
@@ -1,8 +1,25 @@
 fun test() {
-  1 : Byte
-  1 : Int
-  <!TYPE_MISMATCH!>1<!> : Double
-  1 <!USELESS_CAST!>as<!> Byte
-  1 <!USELESS_CAST!>as<!> Int
-  <!ERROR_COMPILE_TIME_VALUE!>1<!> <!CAST_NEVER_SUCCEEDS!>as<!> Double
-}
+    1: Byte
+    1: Short
+    1: Int
+    1: Long
+
+    0x001: Long
+    0b001: Int
+
+    0.1: Double
+    0.1: Float
+
+    1e5: Double
+    1e-5: Float
+
+    <!TYPE_MISMATCH!>1<!>: Double
+    <!TYPE_MISMATCH!>1<!>: Float
+    
+    1 <!USELESS_CAST!>as<!> Byte
+    1 <!USELESS_CAST!>as<!> Int
+    0xff <!USELESS_CAST!>as<!> Long
+    
+    <!ERROR_COMPILE_TIME_VALUE!>1.1<!> <!CAST_NEVER_SUCCEEDS!>as<!> Int
+    <!TYPE_MISMATCH!>1.1<!>: Int
+}
\ No newline at end of file