Fixed mistakes on commit 3a0fc93edf5be7a5c1c6ab89ab9e7db34cf6de52