Fix issue #149

See for details: http://savannah.gnu.org/patch/?8081