Commit fixing 20140623