fixing disabled-state