Fix for PTR_0002
Fix for PTR_0002 after merge and solving conflict