fixes  #2919
fixes #2889