Fixed FOR issues (REF-337)