workaround the issues related to 77e6a6e