Extra checks to hopefully fix #68