Fix of Issue # 224-6dd41ae9

Please review the changes made for issue # 224-6dd41ae9