Lib: Fixed issue #35