Fixed issues from previous commit