one more tweak for Alpha 0.2a