And let's try to replace the curry completely - thanks @silentguardian for the idea!

Signed-off-by: emanuele <emanuele45@gmail.com>