Feature/iteration 6 dev fix card disabling again

Not sure why this code got re-added but i've fixed it again.