Fixing https://github.com/CakeDC/utils/issues/102