fixed bugs 2014-02-12