Add a test case for issue 936