Fix for issue #152.

This should do it...