Fixed so that no warnings are reported