Fix Attachtments Issue