Work on #237
REALLY fix #236