proposed solution for #11