Changes for removing error