Solution to #16