Fixed with bf45478bf728b5d43b4bb3f50a2c3332d621e1e5