Fixed it for good this time...