Fix moment returnType