Fixed, and rebased on master