Fixed parseInt issue