fixed the problem! need to test soon