Update moment support
Bug fix