Fixed bug in previous commit (2)