Fixed problem during change over