Fix for item #1133