Fix for commit 8869b68bdb399515dde5691461111a20662ab10a