Workaround for the issue #36.