better - catches some other cases also