Proper patch-2

oops. clicked on patch-2 too quick. proper patch 2 here.