Fixed several serious issues introduced in the last updates that tried to fix other several serious issues. Sorry about that!