Fixes 2205

Fixes ticket #2205