Bug #1026 fixed (regression)