Temporary fix to #139.
Merge branch 'tempfix139'