Make enable/disable work