Fix for #15