solved #40