Should resolve issue #1