bug fix try #2