Issue LOOP-72 by tj: Added patch