A fix for my fix for my PM system (YO DAWG!)