Attempt a solution for #22