Fixed issue #63. Again.