* BUMP * see #16 & #19