Fixes #4011