Bug fix in 'get' function