TL bugfix reimplemented