Fix image enabling/disabling