Issue #LOOP-77 by tj: Added patch