Fix issue with fill missing some space