Still some bugs on spots