some fix
merge from laurating