[#master] Fixed bugs.