Get rid of temp move element
Fix last commit