Fix #2 for PM