Fix #14 and #15