Hotfix/picswitch