Sample 3 fix