Bugfix #3986

Closes #3986