- Fixed bug wrt missing global properties