agreed, this is a workaround