Fix for NAR-189

Fix for NAR-189