Less dumb fix for attribute declarations