Bugfix last changes