More fixed for issue #197