Removed the -w option (it was too buggy)