Minor bug fix
Merge Fix now