Comment 22 for bug 1085

Created attachment 199906
THis patch is what I mentioned in comment 17

This patch simply add one more feature and doesn't influent any other part of
codes.