resolution for #2415