work on bug #41