New attempt at working around #420