fix for #436