Tested and fixed in d9bf0c82f436a57134e07d70acb5d65b0cdb5451