PLF-5994 Fix bug 01, 02