another attempt at working around issue7980