Fixed move element implementation