Platform Portability Bug Fix.