Minor changes (bug fix)
Merged