Fix sub only firing once