fixed undefined properties