Fixed bug where different attrs were being confused