Return value improved.