Fix for #35