Better solution to 0.2.3