Working on Clojurescript fix