Fix feature problem