bug fixing, still bad