Issue #399 - additional fix