Bugfix lemaster