Another potential resolution for issue #1361