compiles on linux
Merge pull request #6380 from ricardoquesada/compiles_on_linux

compiles on linux