Merge pull request #1608 from ey6es/master

Compile fix (for me, anyway).