Fix #1102
Merge commit '03cb25ee4b53a7bb9fd0ea8c32a8228867c916e1'