PORTED FIXES #2