workaround for issue 206 and issue 204