Fixed bug with previous commit