and removed the 'w' option, as it causes more problems than it fixes