Fix #214 again, accidentally reverted somewhen