fix for bug #24