Fix bad samples (Fix #19)