Properly handle stage type change