Fixed attrs issues