solved #487