Merge "Fix bug due to wrong changes"