Proper fix issue #107.