Fix for problem #2891