Fixed mistakes in previous commit