Fixed bug with last commit