Type - Interface Fix