Issue 361 solved #361