fixed for final