Fixes holding and switching weapons

fixes #1291