force vala and simplifing patch