Fix to allow multiple shortcuts