fix LP:#1157955 and LP:#1157958
temporarily fix random attribute errors
Fix LP:#1156337
  Fix LP:#1156337
  temporarily fix random attribute errors
  fix LP:#1157955 and LP:#1157958