Fixed final issue