Quick solution to #5