Cleaner solution (which now stops too :wink:)