solved #67