Build fix Black-6