small fix, still not fully working