fixes #33 with a hack for now