Removing hacky workaround
Version bump to 1.6.11