Updating to include issue discussed in #4096