transition bug fixes