- (Bug Fix) Fixed more stability issues