Josh's fix