attempting to fix my fix which broke it all