fixing, kinda