Merge pull request #2550 from arian/fix-2549