Fix issue #233

Here it goes.