Fix issue #53. Thx to Fernando Giraldez.