sorted issue with breaking