add a hack now, fix it later