Fixed by c0d1823