Removed workaround