yet another attempt to fix #533