rhbz953734 - fix up things