fixed samples 17 30