remove work around code for bug