Hopefully fix #169