workarround / fix #237