Fixed with 9c8267a9a8