Fixed some dumb design decision