A workaround for issue #112