Moment dependency fix