JS Bug Fix