Make it more lenient to extra samples