Fixed but with removing listeners for once