Merge "Fixed a bug in commit a4a5a210"