Fixing last js bug