PM issue fix