Added workaround