diff --git a/bin/kotlin b/bin/kotlin
index 4f03952c5b3..e456ffbe73d 100755
--- a/bin/kotlin
+++ b/bin/kotlin
@@ -8,7 +8,7 @@ die() {
 root=`cd $(dirname $0)/..; pwd`
 
 ideaRoot=
-for d in /Applications/Nika-*.app; do
+for d in $root/ideaSDK /Applications/Nika-*.app; do
     if [ -d "$d/lib" ]; then
         ideaRoot="$d"
         break
@@ -18,7 +18,7 @@ done
 test -n "$ideaRoot" || die "Idea root not found"
 
 classpath="$root/out/production/cli"
-classpath="$classpath:$root/out/production/backend:$root/out/production/frontend:$root/out/production/frontend.java:$root/out/production/jet.as.java.psi"
+classpath="$classpath:$root/out/production/backend:$root/out/production/frontend:$root/out/production/frontend.java:$root/out/production/jet.as.java.psi:$root/out/production/util"
 classpath="$classpath:$root/out/production/stdlib"
 classpath="$classpath:$root/lib/*:$ideaRoot/lib/*:$ideaRoot/lib/rt/*"