BUG: Fix #3214