bug fix
Merge pull request #455 from ndomar/c5_MohamedShaban_#45_bug_fix

C5 mohamed shaban #45 bug fix