complete fix for bug #154