Fixed Update - again - hopefully for good this time