Resolved by b179f65