small hack to get around bug, still needs to be fixed though