another attempt to repair the stroke/fill logic