Fix for CR from pmwkaa