Fixed problems from previous commit