Fixing local attachment bug