Wip/no blankies

Fixed #1574 , see #1574 for more details