still working on fix for bug #29