Hot fix on issue #43.