Fix for commit ca57d149f4