bug fix
merging