Better implementation of c45f6bd
1.1.1