Bug fix to #130