Issue #435: Updated as requested