Fix #246

Always, it's final.