Frog fix and Attachment fix