short circuit to behave same way as prev bugfix