Fix for issue #434 I hope...