Solution to #6