/.. at the end was still bugged