Fix feature value handler