fixed issue15b