Finally get this patch right :)