Bug with teleport
Added attribute to Martin