Fixed bug introduced in previous COmmit