Fixed one more bug