Fixed bug with re-used attributes