Hopefully fixing issue #28.