Bug fix - clicking is now volatile