Minor change on attach