changed some references as workaround