Factorize a bit
Hot fix issue #169