this is a hack, but it works OK for now