Solution to #7