Oops, removed duplicated code