working on infinity bug