Fixed errors sometime