#13 removed an useless method