to be debuged tmr
bugfix version