Fix #1219
Merge pull request #1226 from getnikola/fix-1219

Fix #1219