Fix for attachment