Fix #63, fix #17