Fix for #436