Fix storing output attributes