Hopefully fix #31, please test!