Fixed done and another fix to previous