here is the code that went in the last release...