Issue #398 - small cahnges