Fix symptoms of #1. Real fix is still missing