Partial addressing #12 by removing parseInt