using a workaround for fix last issue