Bug fix: http://stackoverflow.com/a/5542465/724176