Modify get-operation correctly