fixing short nationality issue