Fix for #61