Issue #290: portability change