Fix #846

I push to master to fix before 1.4 release