now the if should be fixed