(proposed fix for the issue; probably not ideal)