Fix bug according to Chris commit
Merging