Fixed bug introduced by commit 1a73e65534bbe990402b0a163e413040a609a895