overcome transition issues
more issue resolution