added same condition check, fixed interpretation bug