Fix bug for 1 to 1 attachment