better handling of reset transitions