Fixed Critical Bug