added and applied Eddie's patch.
temporary commit.