Fix for APPFAC-2246