Fixed last minute issue with object disposal.