Fixed merge issues from previous commit