This Fixes #900

Missed this function while merging