Temporary fix for Codebase Ticket #823