Feature/js fix

(will email to explain this)