Fixed check and session