resolution for #17