Improved fox for issue #107