Solution to #2