minor changes to avoid unnecessary crash..