Fixed the return values on instantiation