Hopefully finally fix #26