Fixed errors caused by commit 8189a78e77