Fixed Mandatory features working with distinct button