Complete #941 - Not Tested