1 more fix, still doesnt work correctly