ghetto fixes for reload