Fix blackboard issue