Resolve a issue #3