temporary fix for bug #24