more work but it may be a workaround