Fixing Bug #441

Unit test are pending.