ugly partial fix for bug