Fix oneway bug and add a test