Fix #1028
conflict
Merge pull request #1030 from getnikola/fix-1028

Fix #1028