Issue/2758

Resubmitting