Hopefully fix #103