Fixed issues #2975 and #2974