more changes related to fix to #405