Resolve bug issue #13