Fixed for errors caused by slasher's changes