fixed samples18 and 21