Fix Bug #441

Unit test are done