Fixed bug introduced by "#016151770ddd702d"