Fix a part of #17