Fix wrong method implementation (merge error..)