Temp fix for Shortcuts