Removing that check until I figure out a better solution.