Fxes for #17