fixes lingering issues