Fix for Completed View