more fixes for %50