Fix for commit 9e1964d