#43 Empty link problem solved