fixes for attachment