Isn't this the solution?