Fix #13 and #14

OK, fixed.