Fix for #11