2014-10-10 bug fixed