I wasn't sure: doesn't this change brake the api?