Hotfix 1.6.1

#3904