solved #27
solved #36