Is this fixed yet? Sounds like we just need to change the return type?