Fix for broken PM system