Fix move bug, TODO later in separate method!