Fix for #12