Fixed a slight problem that was had with the constructor