Removed obsolete if statement ;-)