Should resolve issue #35