Fix #1759

#1759 
Opa!