fixed design buggs