proposed solution for #6