Fix for snippets APPS-139