still fixing issue #4