Temporary workaround for issue #21