might Fix the issue #132 but might not be sufficient, test case should be written