fixed for new protocol