L20 and L89 fix
Geffe fix