Hacky solution