[fix] Hot fixes #2.