merged
Fixed exec order for Controllable