fix BUG issue #3