Fix for GU issue 264