Fixed weird  issue from merging