Fixes access to undefined properties