#164 fixed items identified by Sebastien