Fixed the 'fix' from last commit