This Fixes #906,#899