Fixed dispose()