BUG: Fix #3222