In theory this will fix #1585... now how to test it?