Fixed bug fix introduced in previous commit