Fix #13 and #14

Sorry, this line should go away, of course.