Another solution to #1