Mess With States

Try to fix bug (discovered to be in FML)