Fix for issue #1284.

Fix for issue #1284.
@yugangw-msft  sorry I am not clear, can you elaborate?