Fix for #13