Fix with new attachment introducing