dan's fix