#32 fix attempt