Fixed bug resulting from #433