Workaround for move bug