solved #18 and #67