BugFix cuz new version of KineticJS
refactor