Fixed some stupid issue