Fix with new attachment

Fix for SI-6629