Dealing with issue #4