Fixed unstoppable elements
Merge pull request #252 from dswd/fix-unstoppable-elements

Fixed unstoppable elements