Fix bug about #50