Fixed #158, Enable Done when valid values