[1030889] Fixed expandables