Changed to fix compilation errors