#176 Previous commit brought back an old bug. Instead I've implemented feature request #137 which makes this whole problem redundant.