Quick solution to #20.