Hopefully fix #36