Issue #528 Improved request