Add hack fix for blackboard