Fix for return type consistency