Updated fix 2014-09-30, made working all