closes #4443 and #4442