Fix #6 ... I think.