Fixed on Mac again. 4.1 context. 4.3 context on Linux now but will have to work with 4.1 to keep portability.