Fix for #8 and potential fix for #14