#179 seems to handle it well.