Fix for #33