updates #388, #390