Remove unnecessary .toString, add one where it would fix a build error