mini part of the patch on the mailing list to fix the boards again