maybe this will do the right thing?