Changed to work with newer client