Better solution to #220