Slightly fixed JS