Final little bit for fixing #19.