Hopefully fixing issue #165