an attemp to fix #238