further fix related to #675