Fixed & tested