Fixed (I hope) #1057
Merge pull request #1187 from qreal/#1057

Fixed (I hope) #1057