Fix #13 and #14