fixes for load on toggle