Still bug fixing in 'get'