further fix to #238