final fix + test