Quick fix - Final