Fixed #13. About time, too...