fixed solution for #11