Might address Anton's problem mentioned in 2ef3bd30975fd63823d6a67daa18fac04dbdc727