Maybe fixed the expanding bug