Fixed Static Issues Problem