changed one return for safe operation