20140901_Fixed the issue reported