Fix for bug introduced in last commit