Modified after testing in rhc environment