Hopefully fix #221