Fixed sample build