Try to fix issue #221
Hopefully fix #221