Efficiency 1.19d

Fixes #1500 
Fixes #1502