IT SHOULD NOW BE FIXED! FINALY