Merged fix from OpenNet