Implement settle demand#56

Fix #56