A slight dirty bug fix and reverting from boolean logic in the protocol