Fix breaking code from commit 905305cf