Fix for initiating/receiving