Fixed faulty code ;)
Merge pull request #461 from Junkern/issue#450

Fixed faulty code ;)