Fixed, see the following patches