Added fill indicator.
Bug fix.