#PG-7 fixed issue provided comments