Fixed stop behaviour
Improved the specs