Workaround to fix #1393