Fix for issue #1214 simplified.