Last Momment error fix.