Fixed issue with JS