Bug fix
merging