This should also fix https://github.com/moment/moment/issues/1237