fix buggs 4