Fix to Julius Manni's proposal
Merge pull request #1339 from stude1/master

Fix to Julius Manni's proposal