one more 2 to 3 fix on return value