Fixing undefined return value.