Duplicate fix #808 to original source error