Bug #1185 fix