add patch from http://goo.gl/NqdsU