Fixed bug after cherrypick