Tested and fixed on 0.10.33