Bug fix
merge conflicts