fixed #1361 updated sources