possible fix to #138