Fixed mistakes from previous commit