handle these cases better