Added check for postback