Fixed MOO bug