add temporary hacks to avoid irrelevant errors