solved #342