Switched from new Date().getTime() to Date.parse()