Merge pull request #1811 from ShabbyX/fix