Fixed the return mechanism on COMM