Bug fix try #2