Added a quick check to allow cleaner control