Rotating mesh seems to get rid of corner case. Solution looks good.