for now a hacky solution