Fixes 724

Tested on Debian Squeeze