Fix for PM