revert last commit and add new condition for get()