fixed possible issue #18