Fixed to sample code