fixed workaround