Fix features-loop