LUN-368 - fix loader