fixed moment bug