Hopefully fixing issue #165

Attempt to fix #165