Fix for Issues #291 and #293