remove work around that breaks things