changelog and code simplification for #594