don't know why and how and shit, but fix (and design scaling tweaks)