Bug fix for moment.js