Fix for new attributes