Fixed issue that came from the merge of the last 4 PRs.