cleaner and an extra check - just in case ;)