Fix to handle no passed args