rolling back to dan's fix for dan's bug -.-