hacked a fix to PM with data