fixed lifting bug
Merging