Fixed issue where drum fill could be too long