Fixed handling of floating attachments