diff --git a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/DebugProcessImpl.kt b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/DebugProcessImpl.kt
index 7602e93a62a4..b67a9d7e886a 100644
--- a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/DebugProcessImpl.kt
+++ b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/DebugProcessImpl.kt
@@ -215,7 +215,7 @@ abstract class DebugProcessImpl<C : VmConnection<*>>(session: XDebugSession,
   override fun isLibraryFrameFilterSupported() = true
 }
 
-class LineBreakpointHandler(breakpointTypeClass: Class<out XBreakpointType<XLineBreakpoint<*>, out XBreakpointProperties<*>>>, private val manager: LineBreakpointManager) : XBreakpointHandler<XLineBreakpoint<*>>(breakpointTypeClass) {
+class LineBreakpointHandler(breakpointTypeClass: Class<out XLineBreakpointType<*>>, private val manager: LineBreakpointManager) : XBreakpointHandler<XLineBreakpoint<*>>(breakpointTypeClass) {
   override fun registerBreakpoint(breakpoint: XLineBreakpoint<*>) {
     manager.setBreakpoint(breakpoint)
   }
diff --git a/platform/script-debugger/protocol/protocol-reader/src/InterfaceReader.kt b/platform/script-debugger/protocol/protocol-reader/src/InterfaceReader.kt
index 0c11cad8c7e2..0cabc7230f40 100644
--- a/platform/script-debugger/protocol/protocol-reader/src/InterfaceReader.kt
+++ b/platform/script-debugger/protocol/protocol-reader/src/InterfaceReader.kt
@@ -78,12 +78,13 @@ internal class InterfaceReader(val typeToTypeHandler: LinkedHashMap<Class<*>, Ty
       hasUnresolved = false
       // refs can be modified - new items can be added
       for (i in 0..refs.size - 1) {
-        val ref = refs.get(i)
-        ref.type = typeToTypeHandler.get(ref.typeClass)
+        val ref: TypeRef<out Any?> = refs.get(i)
+        val typeClass: Class<out Any?> = ref.typeClass
+        (ref as TypeRef<Any?>).type = typeToTypeHandler.get(typeClass) as TypeWriter<Any?>?
         if (ref.type == null) {
-          createIfNotExists(ref.typeClass)
+          createIfNotExists(typeClass)
           hasUnresolved = true
-          ref.type = typeToTypeHandler.get(ref.typeClass) ?: throw IllegalStateException()
+          (ref as TypeRef<Any?>).type = typeToTypeHandler.get(typeClass) as TypeWriter<Any?>? ?: throw IllegalStateException()
         }
       }
     }
@@ -126,7 +127,7 @@ internal class InterfaceReader(val typeToTypeHandler: LinkedHashMap<Class<*>, Ty
     for (ref in refs) {
       if (ref.typeClass == typeClass) {
         assert(ref.type == null)
-        ref.type = typeWriter
+        (ref as TypeRef<Any?>).type = typeWriter as TypeWriter<Any?>
         break
       }
     }
diff --git a/platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/XLineBreakpointTypeBase.java b/platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/XLineBreakpointTypeBase.java
index adbc7b206b54..9def9119a71d 100644
--- a/platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/XLineBreakpointTypeBase.java
+++ b/platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/XLineBreakpointTypeBase.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2000-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.intellij.xdebugger.breakpoints;
 
 import com.intellij.openapi.project.Project;
@@ -8,7 +23,7 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public abstract class XLineBreakpointTypeBase extends XLineBreakpointType<XBreakpointProperties> {
+public abstract class   XLineBreakpointTypeBase extends XLineBreakpointType<XBreakpointProperties> {
   private final XDebuggerEditorsProvider myEditorsProvider;
 
   protected XLineBreakpointTypeBase(@NonNls @NotNull final String id, @Nls @NotNull final String title, @Nullable XDebuggerEditorsProvider editorsProvider) {