This shopuld be covered by test too.