Issue #528 slight improvement