Fixed bugs from 1.9.3