fix for bug #56
fix for bug #54