Fix #1424 some more