CON-22 | Fixed after design review