Fix for Issues #905 and #906