rhbz1124630 - fix according review comments