Fix 955

Tested under Ubuntu 12.04.