#98 additional fix