Fixed #228
(cherry picked from commit e3747bb502a8a09ecea1e9b00628e9705568eebf)
FreakshareCom: fixed #210
(cherry picked from commit 7fe507de68c91595e00e93149d92051bc440ce4b)