workaround for issue