Fixed 2 bug