Fix #14 and fix #15