Fix shortcuts, another try.