Issue #13 - additional fix