#JC-1417 alt fixed