[BUG #7501] Used util methods instead own implementation.