bugfix for ubuntu linux
merging