Important bug fix with shortcuts