Merge pull request #1439 from AndrejMitrovic/Fix5450