ported fix