Fixed #5 - Effects do not stop