Should resolve issue #1248