Another fix for commit 5a6f783307ff48f03882076002c9195a3b4c6855