back to June's 16 version that works better