Quick fix for github issue #37