Should hopefully catch all cases