fixes, test passes