Fix #74 using the "bandaid" solution