Removing debug check