Solution to #17