fix buggs 5