Fix lifting and test it