Bugfix initial commit tmdev