Fix for issue #231 conform proposal of Dave