Updated handling in to use getstr() properly nao