Fixing samples 1 and 2