Fixed Blug From Previous