Fixed #128
Should fix #125
Merge