Fixed up #102