Hopefully fix #7