Fix again the syntax

Note for self: add extensive tests