Really, really fix #115