Made some changes, not sure if it will fix or not.