fixed samples04, 05, 09