some fixes #STOPPUSHINGBROKENCODE