Fix shape fill... didn't work last time.