Fixed conflict with ees-lin stuff