fixed final issues application