macro bugfix in with-fill and with-stroke