Fixed modified dispose