Removed ugly premature return from fill loop.