Added return to Control.g