moar fix attempts using class lock