Fixed bug in previous commit