Fixing PMA issue #5