Works without workaround, fixed merge conflict
Works without workaround, fixed merge conflict

jwfong/GreenFieldOfDreams,GreenFieldofDreams/GreenFieldOfDreams,GreenFieldofDreams/GreenFieldOfDreams,jwfong/GreenFieldOfDreams