removed unnecessary condition for better compatibility