Finally fixed prop issues from the refactor